(display_string): Determine multibyte from current buffer,

not from W's buffer.

diff --git a/src/xdisp.c b/src/xdisp.c
index 40642ecb16c20d3564b6deffb40ae8a1662a895a..3c3e526ead5034caa3b45403b48355aa9196b728 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4722,7 +4722,7 @@ display_string (w, vpos, string, length, hpos, truncate,
   GLYPH *p1start = desired_glyphs->glyphs[vpos] + hpos;
   int window_width = XFASTINT (w->width);
   /* If 1, we must display multibyte characters.  */
-  int multibyte = !NILP (XBUFFER (w->buffer)->enable_multibyte_characters);
+  int multibyte = !NILP (current_buffer->enable_multibyte_characters);
 
   /* Use the standard display table, not the window's display table.
      We don't want the mode line in rot13.  */